# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1242  -> 1.1243 
#	     kernel/printk.c	1.28    -> 1.29   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/09	jbarnes@sgi.com	1.1239.1.4
# [PATCH] ia64: cpumask_t fixes
# 
# This patch coverts a few spots to use cpumask_t instead of unsigned
# long.
# --------------------------------------------
# 03/09/09	jbarnes@sgi.com	1.1239.1.5
# [PATCH] ia64: update Kconfig comment for NR_CPUS
# 
# --------------------------------------------
# 03/09/15	jbarnes@sgi.com	1.1239.1.6
# [PATCH] ia64: turn off SLIT debugging
# 
# This code works pretty well now, so we don't need to dump all this stuff
# at boot time (esp. on 128 node systems).
# --------------------------------------------
# 03/09/15	jbarnes@sgi.com	1.1239.1.7
# [PATCH] ia64: protect PAL mapping printk with EFI_DEBUG
# 
# Having this print out for every CPU on a large system was a pain, so
# protect the printk with EFI_DEBUG.
# --------------------------------------------
# 03/09/15	davidm@tiger.hpl.hp.com	1.1239.1.8
# ia64: Re-enable /proc/sal support.  Bug reported by Stephane Eranian, patch
# 	by Jesse Barnes.
# --------------------------------------------
# 03/09/15	eranian@hpl.hp.co	1.1239.1.9
# [PATCH] ia64: minor perfmon2 patch
# 
# This patch fixes a typo in pfm_write_pmcs() in the test for the default
# value. The code was using the lop index instead of the register
# index in the PMC_DFL_VAL() macro. This was causing valid values
# for some PMCs to be rejected.
# --------------------------------------------
# 03/09/17	davidm@tiger.hpl.hp.com	1.1239.1.10
# ia64: In <asm-ia64/param.h>, do not include <linux/config.h> outside
# 	the #ifdef __KERNEL__ bracket.  Doing so pollutes the user-
# 	level namespace.  Bug report & proposed fix by GOTO Masanori.
# --------------------------------------------
# 03/09/18	davidm@tiger.hpl.hp.com	1.1239.1.11
# ia64: Control /proc/bus/mckinley/zx1 via separate SBA_PROC_FS macro and turn
#       SBA_PROC_FS off by default (it's too much of a scalability bottleneck).
# --------------------------------------------
# 03/09/18	jes@wildopensource.com	1.1239.1.12
# [PATCH] ia64: small sn2 cleanup
# 
# Attached is a small cleanup patch for the sn2 header files which removes
# some cases of excessive header file inclusion.
# --------------------------------------------
# 03/09/18	eranian@hpl.hp.com	1.1239.1.13
# [PATCH] ia64: pass si_isr for a few more signal sources
# 
# This patch changes the kernel such that si_isr gets setup for hardware
# breakpoints, single-step, and taken-branch traps.  This is useful, e.g., to
# determine what kind of hw breakpoint triggered the signal.
# --------------------------------------------
# 03/09/18	jes@wildopensource.com	1.1239.1.14
# [PATCH] ia64: sn2 header file cleanup
# 
# This patch removes a ton of pointless big endian defines for some
# registers on SN2 and cleans up the #include hierachy making it include
# some really big header files only when they are really needed.
# --------------------------------------------
# 03/09/18	jes@wildopensource.com	1.1239.1.15
# [PATCH] ia64: include/asm-ia64/sn/router.h cleanup
# 
# Minor cleanup.
# --------------------------------------------
# 03/09/18	jes@wildopensource.com	1.1239.1.16
# [PATCH] ia64: fix for include/asm-ia64/acpi.h
# 
# asm/acpi.h relies on struct pci_vector_struct which is defined in
# asm/system.h.
# --------------------------------------------
# 03/09/18	jbarnes@sgi.com	1.1243
# [PATCH] ia64: fix early printk for sn2
# 
# Quick fix for the early printk function name for sn2.  Goes along with a
# patch I'm about to send to Andrew.
# --------------------------------------------
#
diff -Nru a/kernel/printk.c b/kernel/printk.c
--- a/kernel/printk.c	Fri Sep 19 00:40:24 2003
+++ b/kernel/printk.c	Fri Sep 19 00:40:24 2003
@@ -790,7 +790,7 @@
 # endif /* CONFIG_IA64_EARLY_PRINTK_UART */
 
 #ifdef CONFIG_IA64_EARLY_PRINTK_SGI_SN
-extern int sn_sal_console_out(const char *str, int len);
+extern int early_printk_sn_sal(const char *str, int len);
 #endif
 
 void early_printk(const char *str, size_t len)
@@ -802,7 +802,7 @@
 	early_printk_vga(str, len);
 #endif
 #ifdef CONFIG_IA64_EARLY_PRINTK_SGI_SN
- 	sn_sal_console_out(str, len);
+ 	early_printk_sn_sal(str, len);
 #endif
 }